From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 23 May 2011 21:15:08 +0000 (-0400)
Subject: messageTray: Don't animate notifications if they've shrunk.
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8200
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0ae1556b9483f7f700128eab4c50232cb0102b8b;p=gnome-shell.git

messageTray: Don't animate notifications if they've shrunk.

The effect of the large gap breaks the illusion of the message attached to
the bottom of the screen.

https://bugzilla.gnome.org/show_bug.cgi?id=641570
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 8c7dbf818..5c57c9c2e 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2011,9 +2011,15 @@ MessageTray.prototype = {
         this._notification.expand(!autoExpanding);
     },
 
-   _onNotificationExpanded: function() {
+    _onNotificationExpanded: function() {
         let expandedY = this.actor.height - this._notificationBin.height;
-        if (this._notificationBin.y != expandedY)
+
+        // Don't animate the notification to its new position if it has shrunk:
+        // there will be a very visible "gap" that breaks the illusion.
+
+        if (this._notificationBin.y < expandedY)
+            this._notificationBin.y = expandedY;
+        else if (this._notification.y != expandedY)
             this._tween(this._notificationBin, '_notificationState', State.SHOWN,
                         { y: expandedY,
                           time: ANIMATION_TIME,